merge with ia64 sn2+machvec tree
authorawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Wed, 20 Dec 2006 21:55:02 +0000 (14:55 -0700)
committerawilliam@xenbuild2.aw <awilliam@xenbuild2.aw>
Wed, 20 Dec 2006 21:55:02 +0000 (14:55 -0700)

Trivial merge